from trunk
authorKenichi Handa <handa@m17n.org>
Tue, 16 Mar 2010 01:04:20 +0000 (10:04 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 16 Mar 2010 01:04:20 +0000 (10:04 +0900)

Trivial merge